Don't blow out whitespace in GPX writer on unknown tags.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4101 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 06fb24ccb21cdeb33d03f8c8ff035ebf0d950e4d..55413910d13e09b79acccd36b9263cac85266923 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -1454,7 +1454,6 @@ fprint_tag_and_attrs(const char* prefix, const char* suffix, xml_tag* tag)
 static void
 fprint_xml_chain(xml_tag* tag, const waypoint* wpt)
 {
-  char* tmp_ent;
   while (tag) {
     if (!tag->cdata && !tag->child) {
       fprint_tag_and_attrs("<", " />", tag);
@@ -1462,6 +1461,7 @@ fprint_xml_chain(xml_tag* tag, const waypoint* wpt)
       fprint_tag_and_attrs("<", ">", tag);
 
       if (tag->cdata) {
+        char* tmp_ent;
         tmp_ent = xml_entitize(tag->cdata);
         gbfprintf(ofd, "%s", tmp_ent);
         xfree(tmp_ent);
@@ -1477,9 +1477,16 @@ fprint_xml_chain(xml_tag* tag, const waypoint* wpt)
       gbfprintf(ofd, "</%s>\n", tag->tagname);
     }
     if (tag->parentcdata) {
-      tmp_ent = xml_entitize(tag->parentcdata);
+      // retain whitespacing, but nuke leading NL as the above will add a trailing.
+
+      char* otmp_ent, *tmp_ent = NULL;
+      otmp_ent = xml_entitize(tag->parentcdata);
+      if (otmp_ent[0] == '\n')
+        tmp_ent = otmp_ent+1;
+      else
+        tmp_ent = otmp_ent;
       gbfprintf(ofd, "%s", tmp_ent);
-      xfree(tmp_ent);
+      xfree(otmp_ent);
     }
     tag = tag->sibling;
   }